Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Sat, 5 Mar 2016 01:53:50 +0000 (20:53 -0500)
committerTom Rini <[email protected]>
Sat, 5 Mar 2016 01:53:50 +0000 (20:53 -0500)

Trivial merge